merge with xen-unstable.hg

diff --cc xen/arch/ia64/xen/Makefile
index 8eee2940e1932f71a14e7f03a9d9b34fcee33c7b,c50c47dde932b793eee9f508cb59b67313efccaa..2ddd6bfd6044c8abba9d8bef7bc951cf6980432d
--- 1/xen/arch/ia64/xen/Makefile
--- 2/xen/arch/ia64/xen/Makefile
+++ b/xen/arch/ia64/xen/Makefile
@@@ -1,5 -1,5 +1,7 @@@
 +subdir-y += oprofile
 +
+ obj-y += machine_kexec.o
+ obj-y += crash.o
  obj-y += acpi.o
  obj-y += dom0_ops.o
  obj-y += domain.o